api/maintenance_views.py

@@ -12,8 +12,8 @@ from paginator import pagination

                 from TimeConvert import TimeConvert as tc
              

                 
              

                 from account.models import UserInfo
              

                -from mch.models import ModelInfo
              

                 from maintenance.models import ExpressCompanyInfo, MaintenaceInfo
              

                +from mch.models import ModelInfo
              

                 from pre.custom_message import sendtemplatemessage
              

                 from utils.admin_utils import is_admin, is_maintenanceman
              

                 from utils.error.errno_utils import MaintenanceStatusCode
              
@@ -203,7 +203,7 @@ def maintenance_list(request):

                         start_time = tc.string_to_utc_datetime(start_time, format='%Y%m%d')
              

                         end_time = tc.string_to_utc_datetime(end_time + ' 23:59:59', format='%Y%m%d %H:%M:%S')
              

                         maintenances = maintenances.filter(created_at__range=(start_time, end_time))
              

                -    
              

                +
              

                     if point_id:
              

                         maintenances = maintenances.filter(point_id=point_id)
              

                 
              
@@ -264,10 +264,10 @@ def maintenance_status_update_sendtemplatemessage(maintenance):

                             "color": "#173177"
              

                         }
              

                     }
              

                -    
              

                +
              

                     wxcfg = WECHAT.get('MINIAPP', {})
              

                     appid = wxcfg.get('appID')
              

                -    
              

                +
              

                     sendtemplatemessage(openid=user.openid, template_id=settings.TEMPLATE_ID_MAINTENANCE, data=data, miniappid=appid, minipagepath='/pages/index/index')
              

                 
              

                 
              
@@ -297,7 +297,7 @@ def maintenance_tracking_info_update(maintenance, type_, tracking_info):

                         maintenance.back_tracking_signed = is_tracking_signed
              

                         if is_tracking_signed and old_maintenance_status == MaintenaceInfo.TRACKING_FIXED_BACK:
              

                             maintenance_status = MaintenaceInfo.TRACKING_BACK_SIGNED
              

                -    
              

                +
              

                     if maintenance_status:
              

                         maintenance.maintenance_status = maintenance_status
              

                         maintenance_status_at = maintenance.maintenance_status_at
              

miniapp/views.py

@@ -262,28 +262,30 @@ def get_userinfo_api2(request):

                 
              

                     return response(200, 'Mini App Get Userinfo Success', u'微信小程序获取用户信息成功', user.brandata(brand_id=brand_id))
              

                 
              

                +
              

                 @logit(res=True)
              

                 @transaction.atomic
              

                 def update_userinfo_api(request):
              

                     brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
              

                     user_id = request.POST.get('user_id', '')
              

                     nickname = request.POST.get('nickname', '')
              

                -    avatar = request.POST.get('avatar', '') 
              

                +    avatar = request.POST.get('avatar', '')
              

                 
              

                     try:
              

                         user = UserInfo.objects.select_for_update().get(user_id=user_id, status=True)
              

                     except UserInfo.DoesNotExist:
              

                         return response(UserStatusCode.USER_NOT_FOUND)
              

                -    
              

                +
              

                     if nickname:
              

                         user.nickname = nickname
              

                     if avatar:
              

                         user.avatar = avatar
              

                -    
              

                +
              

                     user.save()
              

                 
              

                     return response(200, 'Mini App Get Userinfo Success', u'微信小程序获取用户信息成功', user.brandata(brand_id=brand_id))
              

                 
              

                +
              

                 @logit(res=True)
              

                 @transaction.atomic
              

                 def membercard_extradata(request):